Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 19:07:30 +0000 (11:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 19:07:30 +0000 (11:07 -0800)

Trivial merge